must return a value of the appropriate type with g_return_val_if_fail

2008-06-20  Hans Breuer  <hans@breuer.org>

	* gtk/gtkmenuitem.c gtk/gtkmessagedialog.c gtk/gtkplug.c : must return
	a value of the appropriate type with g_return_val_if_fail

	* gdk/gdkconfig.h.win32 : add the GSEAL definition here as well

	* gtk/gtkfilesystem.c : don't add the "File System" on win32

	* tests/makefile.msc : remove broken autotestfile(system|chooser)
	from build

svn path=/trunk/; revision=20657

diff --git a/ChangeLog b/ChangeLog
index 608439303fbca9a6e22f0dfb891fa03125737261..3e592b4713fa1239bb838aaecb9ba2c9ef175b1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-06-20  Hans Breuer  <hans@breuer.org>
+
+       * gtk/gtkmenuitem.c gtk/gtkmessagedialog.c gtk/gtkplug.c : must return
+       a value of the appropriate type with g_return_val_if_fail
+       
+       * gdk/gdkconfig.h.win32 : add the GSEAL definition here as well
+
+       * gtk/gtkfilesystem.c : don't add the "File System" on win32
+
+       * tests/makefile.msc : remove broken autotestfile(system|chooser) 
+       from build
+
 2008-06-20  Johan Dahlin  <jdahlin@async.com.br>
 
        * gtk/gtkeditable.c: Document and use - instead of _ in signal names.

diff --git a/gdk/gdkconfig.h.win32 b/gdk/gdkconfig.h.win32
index 1258a460ddd1e8d31f2c1748527bc28b8a35619f..7bd668e81e5c9d07547fbf370a6ee1fa13652fcd 100644 (file)
--- a/gdk/gdkconfig.h.win32
+++ b/gdk/gdkconfig.h.win32
@@ -10,6 +10,14 @@
 extern "C" {
 #endif /* __cplusplus */
 
+#ifndef GSEAL
+/* introduce GSEAL() here for all of Gdk and Gtk+ without the need to modify GLib */
+#  ifdef GSEAL_ENABLE
+#    define GSEAL(ident)      _g_sealed__ ## ident
+#  else
+#    define GSEAL(ident)      ident
+#  endif
+#endif /* !GSEAL */
 
 #define GDK_WINDOWING_WIN32
 

diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index 8ec0e67e283610090780734ec8647c1095fc15aa..d76808372bd04df8040411d60a7d41ca4c146115 100644 (file)
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -555,8 +555,10 @@ _gtk_file_system_list_volumes (GtkFileSystem *file_system)
 
   list = g_slist_copy (priv->volumes);
 
+#ifndef G_OS_WIN32
   /* Prepend root volume */
   list = g_slist_prepend (list, (gpointer) root_volume_token);
+#endif
 
   return list;
 }

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 0696d2131714926cf4f8ed49dc9e9b883ff92ae8..b55c482bb50fe1623e44547b8e093b997c96949c 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -1694,7 +1694,7 @@ gtk_menu_item_set_accel_path (GtkMenuItem *menu_item,
 G_CONST_RETURN gchar *
 gtk_menu_item_get_accel_path (GtkMenuItem *menu_item)
 {
-  g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
+  g_return_val_if_fail (GTK_IS_MENU_ITEM (menu_item), NULL);
 
   return menu_item->accel_path;
 }

diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index 9e7c2f27800f6ae533a8093aa5e9fbdfb59b20f5..75041f096f1c1e7cc463158be75d92f870474292 100644 (file)
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -654,7 +654,7 @@ gtk_message_dialog_set_image (GtkMessageDialog *dialog,
 GtkWidget *
 gtk_message_dialog_get_image (GtkMessageDialog *dialog)
 {
-  g_return_if_fail (GTK_IS_MESSAGE_DIALOG (dialog));
+  g_return_val_if_fail (GTK_IS_MESSAGE_DIALOG (dialog), NULL);
 
   return dialog->image;
 }

diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 15238218fdf223a5b3abdc822679cebd7989afd0..9202b476ed29a9d5a2d6342a871a523aeca34c22 100644 (file)
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -276,7 +276,7 @@ gtk_plug_get_id (GtkPlug *plug)
 gboolean
 gtk_plug_get_embedded (GtkPlug *plug)
 {
-  g_return_val_if_fail (GTK_IS_PLUG (plug), NULL);
+  g_return_val_if_fail (GTK_IS_PLUG (plug), FALSE);
 
   return plug->socket_window != NULL;
 }

diff --git a/tests/makefile.msc b/tests/makefile.msc
index 6450286332556d860464c8fbce7ca189c5fa5114..9018d058799dd0acdd37f5f4dfeb8929f5a0ab9b 100644 (file)
--- a/tests/makefile.msc
+++ b/tests/makefile.msc
@@ -40,8 +40,8 @@ all : \
 # Test programs:
 #
 TESTAPPS = \
-       autotestfilechooser autotestfilesystem \
-       buildertest floatingtest \
+#      autotestfilechooser autotestfilesystem \
+       buildertest floatingtest objecttests \
        testaccel testactions testassistant \
        testbbox \
        testcairo testcalendar testcellrenderertext testcombo testcombochange \
@@ -101,8 +101,8 @@ EXTRA_OBJETCS = testsocket_common.obj
 EXTRA_OBJETCS = testsocket_common.obj
 !ENDIF
 
-$(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).lib $(TESTAPP).obj $(EXTRA_OBJETCS)
-       $(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \
+$(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).lib $(TESTAPP).obj $(EXTRA_OBJETCS) pixbuf-init.obj 
+       $(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) pixbuf-init.obj $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \
        $(PANGO_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(EXTRA_LIBS) $(LDFLAGS)
 
 $(TESTAPP).obj : $(TESTAPP).c